ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
Add server templates with config drift detection and compliance
Juan Denis862678447caa
diff --git a/ROADMAP.md b/ROADMAP.mdindex ec57c2f0..9008221f 100644--- a/ROADMAP.md+++ b/ROADMAP.md@@ -413,22 +413,22 @@ Make the agent extensible — let users add custom capabilities without modifyin----## Phase 29: Server Templates & Config Sync (Planned)+## Phase 29: Server Templates & Config Sync (Completed)**Priority: Medium**Define what a server should look like, apply it, and detect when it drifts.-- [ ] Server template builder — define expected state (packages, services, firewall rules, users, files)-- [ ] Template library — save and reuse templates (e.g., "Web Server", "Database Server", "Mail Server")-- [ ] Apply template to server — install packages, configure services, set firewall rules via agent-- [ ] Config drift detection — periodic comparison of actual vs. expected state-- [ ] Drift report UI — visual diff showing what changed and when-- [ ] Auto-remediation option — automatically fix drift back to template (with approval toggle)-- [ ] Template versioning — track changes to templates over time-- [ ] Template inheritance — base template + role-specific overrides-- [ ] Bulk apply — roll out template changes across server groups-- [ ] Compliance dashboard — percentage of fleet in compliance per template+- [x] Server template builder — define expected state (packages, services, firewall rules, users, files)+- [x] Template library — save and reuse templates (e.g., "Web Server", "Database Server", "Mail Server")+- [x] Apply template to server — install packages, configure services, set firewall rules via agent+- [x] Config drift detection — periodic comparison of actual vs. expected state+- [x] Drift report UI — visual diff showing what changed and when+- [x] Auto-remediation option — automatically fix drift back to template (with approval toggle)+- [x] Template versioning — track changes to templates over time+- [x] Template inheritance — base template + role-specific overrides+- [x] Bulk apply — roll out template changes across server groups+- [x] Compliance dashboard — percentage of fleet in compliance per template---diff --git a/backend/app/__init__.py b/backend/app/__init__.pyindex 2b37298e..0f8adcdf 100644--- a/backend/app/__init__.py+++ b/backend/app/__init__.py@@ -230,6 +230,10 @@ def create_app(config_name=None):from app.api.agent_plugins import agent_plugins_bpapp.register_blueprint(agent_plugins_bp, url_prefix='/api/v1/agent-plugins')+ # Register blueprints - Server Templates+ from app.api.server_templates import server_templates_bp+ app.register_blueprint(server_templates_bp, url_prefix='/api/v1/server-templates')+# Handle database migrations (Alembic)with app.app_context():from app.services.migration_service import MigrationServicediff --git a/backend/app/api/server_templates.py b/backend/app/api/server_templates.pynew file mode 100644index 00000000..56f0becf--- /dev/null+++ b/backend/app/api/server_templates.py@@ -0,0 +1,190 @@+from flask import Blueprint, request, jsonify+from flask_jwt_extended import jwt_required+from app.services.server_template_service import ServerTemplateService+from app.services.audit_service import AuditService+from app.models.audit_log import AuditLog++server_templates_bp = Blueprint('server_templates', __name__)+++def get_current_user():+ from flask_jwt_extended import get_jwt_identity+ from app.models.user import User+ return User.query.get(get_jwt_identity())+++@server_templates_bp.route('/', methods=['GET'])+@jwt_required()+def list_templates():+ category = request.args.get('category')+ templates = ServerTemplateService.list_templates(category=category)+ return jsonify({'templates': [t.to_dict() for t in templates]})+++@server_templates_bp.route('/library', methods=['GET'])+@jwt_required()+def get_library():+ return jsonify({'templates': ServerTemplateService.get_library_templates()})+++@server_templates_bp.route('/library/<key>', methods=['POST'])+@jwt_required()+def create_from_library(key):+ user = get_current_user()+ if not user or not user.is_admin:+ return jsonify({'error': 'Admin access required'}), 403+ try:+ template = ServerTemplateService.create_from_library(key, user.id)+ return jsonify(template.to_dict()), 201+ except ValueError as e:+ return jsonify({'error': str(e)}), 400+++@server_templates_bp.route('/<int:template_id>', methods=['GET'])+@jwt_required()+def get_template(template_id):+ template = ServerTemplateService.get_template(template_id)+ if not template:+ return jsonify({'error': 'Template not found'}), 404+ return jsonify(template.to_dict())+++@server_templates_bp.route('/', methods=['POST'])+@jwt_required()+def create_template():+ user = get_current_user()+ if not user or not user.is_admin:+ return jsonify({'error': 'Admin access required'}), 403++ data = request.get_json()+ if not data or 'name' not in data:+ return jsonify({'error': 'name required'}), 400++ try:+ template = ServerTemplateService.create_template(data, user.id)+ AuditService.log(+ action=AuditLog.ACTION_RESOURCE_CREATE, user_id=user.id,+ target_type='server_template', target_id=template.id,+ details={'name': template.name}+ )+ return jsonify(template.to_dict()), 201+ except ValueError as e:+ return jsonify({'error': str(e)}), 400+++@server_templates_bp.route('/<int:template_id>', methods=['PUT'])+@jwt_required()+def update_template(template_id):+ user = get_current_user()+ if not user or not user.is_admin:+ return jsonify({'error': 'Admin access required'}), 403++ data = request.get_json()+ template = ServerTemplateService.update_template(template_id, data)+ if not template:+ return jsonify({'error': 'Template not found'}), 404+ return jsonify(template.to_dict())+++@server_templates_bp.route('/<int:template_id>', methods=['DELETE'])+@jwt_required()+def delete_template(template_id):+ user = get_current_user()+ if not user or not user.is_admin:+ return jsonify({'error': 'Admin access required'}), 403+ try:+ result = ServerTemplateService.delete_template(template_id)+ if not result:+ return jsonify({'error': 'Template not found'}), 404+ return jsonify({'message': 'Template deleted'})+ except ValueError as e:+ return jsonify({'error': str(e)}), 400+++# --- Assignments ---++@server_templates_bp.route('/<int:template_id>/assign', methods=['POST'])+@jwt_required()+def assign_template(template_id):+ user = get_current_user()+ if not user or not user.is_admin:+ return jsonify({'error': 'Admin access required'}), 403++ data = request.get_json() or {}+ server_id = data.get('server_id')+ if not server_id:+ return jsonify({'error': 'server_id required'}), 400++ try:+ assignment = ServerTemplateService.assign_template(template_id, server_id)+ return jsonify(assignment.to_dict()), 201+ except ValueError as e:+ return jsonify({'error': str(e)}), 400+++@server_templates_bp.route('/<int:template_id>/bulk-assign', methods=['POST'])+@jwt_required()+def bulk_assign(template_id):+ user = get_current_user()+ if not user or not user.is_admin:+ return jsonify({'error': 'Admin access required'}), 403++ data = request.get_json() or {}+ server_ids = data.get('server_ids', [])+ results = ServerTemplateService.bulk_assign(template_id, server_ids)+ return jsonify({'results': results})+++@server_templates_bp.route('/<int:template_id>/assignments', methods=['GET'])+@jwt_required()+def get_assignments(template_id):+ assignments = ServerTemplateService.get_template_assignments(template_id)+ return jsonify({'assignments': [a.to_dict() for a in assignments]})+++@server_templates_bp.route('/assignments/<int:assignment_id>', methods=['DELETE'])+@jwt_required()+def unassign(assignment_id):+ user = get_current_user()+ if not user or not user.is_admin:+ return jsonify({'error': 'Admin access required'}), 403+ result = ServerTemplateService.unassign_template(assignment_id)+ if not result:+ return jsonify({'error': 'Assignment not found'}), 404+ return jsonify({'message': 'Template unassigned'})+++@server_templates_bp.route('/assignments/<int:assignment_id>/check', methods=['POST'])+@jwt_required()+def check_drift(assignment_id):+ assignment = ServerTemplateService.check_drift(assignment_id)+ if not assignment:+ return jsonify({'error': 'Assignment not found'}), 404+ return jsonify(assignment.to_dict())+++@server_templates_bp.route('/assignments/<int:assignment_id>/remediate', methods=['POST'])+@jwt_required()+def remediate(assignment_id):+ user = get_current_user()+ if not user or not user.is_admin:+ return jsonify({'error': 'Admin access required'}), 403++ assignment = ServerTemplateService.remediate(assignment_id)+ if not assignment:+ return jsonify({'error': 'Assignment not found'}), 404+ return jsonify(assignment.to_dict())+++@server_templates_bp.route('/compliance', methods=['GET'])+@jwt_required()+def compliance_summary():+ summary = ServerTemplateService.get_compliance_summary()+ return jsonify(summary)+++@server_templates_bp.route('/server/<int:server_id>', methods=['GET'])+@jwt_required()+def get_server_templates(server_id):+ assignments = ServerTemplateService.get_server_assignments(server_id)+ return jsonify({'assignments': [a.to_dict() for a in assignments]})diff --git a/backend/app/models/__init__.py b/backend/app/models/__init__.pyindex ed66c87b..a42a5b1c 100644--- a/backend/app/models/__init__.py+++ b/backend/app/models/__init__.py@@ -23,6 +23,7 @@ from app.models.event_subscription import EventSubscription, EventDeliveryfrom app.models.invitation import Invitationfrom app.models.metric_alert import ServerAlertThreshold, MetricAlertfrom app.models.agent_plugin import AgentPlugin, AgentPluginInstall+from app.models.server_template import ServerTemplate, ServerTemplateAssignment__all__ = ['User', 'Application', 'Domain', 'EnvironmentVariable', 'EnvironmentVariableHistory',@@ -35,5 +36,6 @@ __all__ = ['OAuthIdentity', 'ApiKey', 'ApiUsageLog', 'ApiUsageSummary','EventSubscription', 'EventDelivery', 'Invitation','ServerAlertThreshold', 'MetricAlert',- 'AgentPlugin', 'AgentPluginInstall'+ 'AgentPlugin', 'AgentPluginInstall',+ 'ServerTemplate', 'ServerTemplateAssignment']diff --git a/backend/app/models/server_template.py b/backend/app/models/server_template.pynew file mode 100644index 00000000..19544d6e--- /dev/null+++ b/backend/app/models/server_template.py@@ -0,0 +1,197 @@+from datetime import datetime+from app import db+import json+++class ServerTemplate(db.Model):+ """Defines expected state for a server — packages, services, firewall rules, users, files."""+ __tablename__ = 'server_templates'++ id = db.Column(db.Integer, primary_key=True)+ name = db.Column(db.String(128), nullable=False, unique=True)+ description = db.Column(db.Text)+ category = db.Column(db.String(64), default='general') # web, database, mail, custom++ # Template version tracking+ version = db.Column(db.Integer, default=1)++ # Inheritance+ parent_id = db.Column(db.Integer, db.ForeignKey('server_templates.id'), nullable=True)+ parent = db.relationship('ServerTemplate', remote_side=[id], backref='children')++ # Expected state specification+ packages_json = db.Column(db.Text) # ["nginx", "php8.1-fpm", ...]+ services_json = db.Column(db.Text) # [{"name": "nginx", "enabled": true, "running": true}, ...]+ firewall_rules_json = db.Column(db.Text) # [{"port": 80, "protocol": "tcp", "action": "allow"}, ...]+ files_json = db.Column(db.Text) # [{"path": "/etc/nginx/...", "content_hash": "...", "mode": "0644"}, ...]+ users_json = db.Column(db.Text) # [{"name": "www-data", "groups": ["www-data"]}, ...]+ sysctl_json = db.Column(db.Text) # [{"key": "net.ipv4.ip_forward", "value": "1"}, ...]++ # Auto-remediation+ auto_remediate = db.Column(db.Boolean, default=False)+ remediation_approval_required = db.Column(db.Boolean, default=True)++ created_by = db.Column(db.Integer, db.ForeignKey('users.id'))+ created_at = db.Column(db.DateTime, default=datetime.utcnow)+ updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)++ assignments = db.relationship('ServerTemplateAssignment', backref='template', lazy='dynamic')++ def _get_json(self, field):+ val = getattr(self, field)+ return json.loads(val) if val else []++ def _set_json(self, field, value):+ setattr(self, field, json.dumps(value))++ @property+ def packages(self):+ return self._get_json('packages_json')++ @packages.setter+ def packages(self, v):+ self._set_json('packages_json', v)++ @property+ def services(self):+ return self._get_json('services_json')++ @services.setter+ def services(self, v):+ self._set_json('services_json', v)++ @property+ def firewall_rules(self):+ return self._get_json('firewall_rules_json')++ @firewall_rules.setter+ def firewall_rules(self, v):+ self._set_json('firewall_rules_json', v)++ @property+ def files(self):+ return self._get_json('files_json')++ @files.setter+ def files(self, v):+ self._set_json('files_json', v)++ @property+ def users(self):+ return self._get_json('users_json')++ @users.setter+ def users(self, v):+ self._set_json('users_json', v)++ @property+ def sysctl_params(self):+ return self._get_json('sysctl_json')++ @sysctl_params.setter+ def sysctl_params(self, v):+ self._set_json('sysctl_json', v)++ def get_merged_spec(self):+ """Get full spec including inherited fields from parent."""+ if not self.parent:+ return {+ 'packages': self.packages,+ 'services': self.services,+ 'firewall_rules': self.firewall_rules,+ 'files': self.files,+ 'users': self.users,+ 'sysctl_params': self.sysctl_params,+ }+ parent_spec = self.parent.get_merged_spec()+ # Child overrides parent+ for key in ['packages', 'services', 'firewall_rules', 'files', 'users', 'sysctl_params']:+ child_val = getattr(self, key)+ if child_val:+ if key == 'packages':+ parent_spec[key] = list(set(parent_spec.get(key, []) + child_val))+ else:+ parent_spec[key] = child_val+ return parent_spec++ def to_dict(self):+ return {+ 'id': self.id,+ 'name': self.name,+ 'description': self.description,+ 'category': self.category,+ 'version': self.version,+ 'parent_id': self.parent_id,+ 'parent_name': self.parent.name if self.parent else None,+ 'packages': self.packages,+ 'services': self.services,+ 'firewall_rules': self.firewall_rules,+ 'files': self.files,+ 'users': self.users,+ 'sysctl_params': self.sysctl_params,+ 'auto_remediate': self.auto_remediate,+ 'remediation_approval_required': self.remediation_approval_required,+ 'assignment_count': self.assignments.count(),+ 'created_by': self.created_by,+ 'created_at': self.created_at.isoformat() if self.created_at else None,+ 'updated_at': self.updated_at.isoformat() if self.updated_at else None,+ }++ def __repr__(self):+ return f'<ServerTemplate {self.name} v{self.version}>'+++class ServerTemplateAssignment(db.Model):+ """Tracks which template is applied to which server."""+ __tablename__ = 'server_template_assignments'++ id = db.Column(db.Integer, primary_key=True)+ template_id = db.Column(db.Integer, db.ForeignKey('server_templates.id'), nullable=False)+ server_id = db.Column(db.Integer, db.ForeignKey('servers.id'), nullable=False)++ # Compliance status+ STATUS_COMPLIANT = 'compliant'+ STATUS_DRIFTED = 'drifted'+ STATUS_CHECKING = 'checking'+ STATUS_REMEDIATING = 'remediating'+ STATUS_UNKNOWN = 'unknown'+ status = db.Column(db.String(32), default=STATUS_UNKNOWN)++ # Drift details+ drift_report_json = db.Column(db.Text)+ last_check_at = db.Column(db.DateTime)+ last_remediation_at = db.Column(db.DateTime)++ applied_at = db.Column(db.DateTime, default=datetime.utcnow)+ updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)++ server = db.relationship('Server', backref=db.backref('template_assignments', lazy='dynamic'))++ __table_args__ = (+ db.UniqueConstraint('template_id', 'server_id', name='uq_template_server'),+ )++ @property+ def drift_report(self):+ return json.loads(self.drift_report_json) if self.drift_report_json else {}++ @drift_report.setter+ def drift_report(self, v):+ self.drift_report_json = json.dumps(v)++ def to_dict(self):+ return {+ 'id': self.id,+ 'template_id': self.template_id,+ 'template_name': self.template.name if self.template else None,+ 'server_id': self.server_id,+ 'server_name': self.server.name if self.server else None,+ 'status': self.status,+ 'drift_report': self.drift_report,+ 'last_check_at': self.last_check_at.isoformat() if self.last_check_at else None,+ 'last_remediation_at': self.last_remediation_at.isoformat() if self.last_remediation_at else None,+ 'applied_at': self.applied_at.isoformat() if self.applied_at else None,+ }++ def __repr__(self):+ return f'<ServerTemplateAssignment template={self.template_id} server={self.server_id}>'diff --git a/backend/app/services/server_template_service.py b/backend/app/services/server_template_service.pynew file mode 100644index 00000000..6d74b9f9--- /dev/null+++ b/backend/app/services/server_template_service.py@@ -0,0 +1,283 @@+import json+import logging+from datetime import datetime+from app import db+from app.models.server_template import ServerTemplate, ServerTemplateAssignment+from app.models.server import Server++logger = logging.getLogger(__name__)+++class ServerTemplateService:+ """Service for server template management and config drift detection."""++ # Built-in template library+ TEMPLATE_LIBRARY = {+ 'web-server': {+ 'name': 'Web Server',+ 'description': 'Nginx + PHP-FPM web server with standard security',+ 'category': 'web',+ 'packages': ['nginx', 'php-fpm', 'certbot'],+ 'services': [+ {'name': 'nginx', 'enabled': True, 'running': True},+ {'name': 'php-fpm', 'enabled': True, 'running': True},+ ],+ 'firewall_rules': [+ {'port': 80, 'protocol': 'tcp', 'action': 'allow'},+ {'port': 443, 'protocol': 'tcp', 'action': 'allow'},+ {'port': 22, 'protocol': 'tcp', 'action': 'allow'},+ ],+ },+ 'database-server': {+ 'name': 'Database Server',+ 'description': 'MySQL/MariaDB database server with backups',+ 'category': 'database',+ 'packages': ['mariadb-server'],+ 'services': [+ {'name': 'mariadb', 'enabled': True, 'running': True},+ ],+ 'firewall_rules': [+ {'port': 3306, 'protocol': 'tcp', 'action': 'allow'},+ {'port': 22, 'protocol': 'tcp', 'action': 'allow'},+ ],+ },+ 'mail-server': {+ 'name': 'Mail Server',+ 'description': 'Postfix + Dovecot mail server',+ 'category': 'mail',+ 'packages': ['postfix', 'dovecot-imapd', 'dovecot-pop3d', 'spamassassin', 'opendkim'],+ 'services': [+ {'name': 'postfix', 'enabled': True, 'running': True},+ {'name': 'dovecot', 'enabled': True, 'running': True},+ {'name': 'spamassassin', 'enabled': True, 'running': True},+ ],+ 'firewall_rules': [+ {'port': 25, 'protocol': 'tcp', 'action': 'allow'},+ {'port': 587, 'protocol': 'tcp', 'action': 'allow'},+ {'port': 993, 'protocol': 'tcp', 'action': 'allow'},+ {'port': 995, 'protocol': 'tcp', 'action': 'allow'},+ {'port': 22, 'protocol': 'tcp', 'action': 'allow'},+ ],+ },+ }++ @staticmethod+ def list_templates(category=None):+ query = ServerTemplate.query+ if category:+ query = query.filter_by(category=category)+ return query.order_by(ServerTemplate.name).all()++ @staticmethod+ def get_template(template_id):+ return ServerTemplate.query.get(template_id)++ @staticmethod+ def create_template(data, user_id=None):+ if ServerTemplate.query.filter_by(name=data['name']).first():+ raise ValueError(f"Template '{data['name']}' already exists")++ template = ServerTemplate(+ name=data['name'],+ description=data.get('description', ''),+ category=data.get('category', 'general'),+ parent_id=data.get('parent_id'),+ auto_remediate=data.get('auto_remediate', False),+ remediation_approval_required=data.get('remediation_approval_required', True),+ created_by=user_id,+ )+ template.packages = data.get('packages', [])+ template.services = data.get('services', [])+ template.firewall_rules = data.get('firewall_rules', [])+ template.files = data.get('files', [])+ template.users = data.get('users', [])+ template.sysctl_params = data.get('sysctl_params', [])++ db.session.add(template)+ db.session.commit()+ return template++ @staticmethod+ def update_template(template_id, data):+ template = ServerTemplate.query.get(template_id)+ if not template:+ return None++ for field in ['name', 'description', 'category', 'parent_id',+ 'auto_remediate', 'remediation_approval_required']:+ if field in data:+ setattr(template, field, data[field])++ for json_field in ['packages', 'services', 'firewall_rules', 'files', 'users', 'sysctl_params']:+ if json_field in data:+ setattr(template, json_field, data[json_field])++ template.version += 1+ db.session.commit()+ return template++ @staticmethod+ def delete_template(template_id):+ template = ServerTemplate.query.get(template_id)+ if not template:+ return False+ active = template.assignments.count()+ if active > 0:+ raise ValueError(f'Cannot delete template with {active} active assignments')+ # Remove children references+ for child in template.children:+ child.parent_id = None+ db.session.delete(template)+ db.session.commit()+ return True++ @staticmethod+ def get_library_templates():+ return ServerTemplateService.TEMPLATE_LIBRARY++ @staticmethod+ def create_from_library(key, user_id=None):+ if key not in ServerTemplateService.TEMPLATE_LIBRARY:+ raise ValueError(f"Unknown library template: {key}")+ data = ServerTemplateService.TEMPLATE_LIBRARY[key].copy()+ return ServerTemplateService.create_template(data, user_id)++ # --- Assignment & Drift ---++ @staticmethod+ def assign_template(template_id, server_id):+ template = ServerTemplate.query.get(template_id)+ if not template:+ raise ValueError('Template not found')+ server = Server.query.get(server_id)+ if not server:+ raise ValueError('Server not found')++ existing = ServerTemplateAssignment.query.filter_by(+ template_id=template_id, server_id=server_id+ ).first()+ if existing:+ raise ValueError('Template already assigned to this server')++ assignment = ServerTemplateAssignment(+ template_id=template_id,+ server_id=server_id,+ )+ db.session.add(assignment)+ db.session.commit()+ return assignment++ @staticmethod+ def unassign_template(assignment_id):+ assignment = ServerTemplateAssignment.query.get(assignment_id)+ if not assignment:+ return False+ db.session.delete(assignment)+ db.session.commit()+ return True++ @staticmethod+ def bulk_assign(template_id, server_ids):+ results = []+ for sid in server_ids:+ try:+ a = ServerTemplateService.assign_template(template_id, sid)+ results.append({'server_id': sid, 'status': 'assigned', 'assignment_id': a.id})+ except ValueError as e:+ results.append({'server_id': sid, 'status': 'error', 'error': str(e)})+ return results++ @staticmethod+ def check_drift(assignment_id):+ """Check configuration drift for a server assignment."""+ assignment = ServerTemplateAssignment.query.get(assignment_id)+ if not assignment:+ return None++ assignment.status = ServerTemplateAssignment.STATUS_CHECKING+ db.session.commit()++ # Send drift check command to agent+ try:+ from app.agent_gateway import get_agent_gateway+ gw = get_agent_gateway()+ if gw and assignment.server:+ spec = assignment.template.get_merged_spec()+ gw.send_command(assignment.server.agent_id, 'config_drift_check', {+ 'assignment_id': assignment.id,+ 'spec': spec,+ })+ except Exception as e:+ logger.warning(f'Could not send drift check command: {e}')++ return assignment++ @staticmethod+ def update_drift_report(assignment_id, report):+ assignment = ServerTemplateAssignment.query.get(assignment_id)+ if not assignment:+ return None+ assignment.drift_report = report+ assignment.last_check_at = datetime.utcnow()+ has_drift = any(+ report.get(k, []) for k in ['missing_packages', 'extra_packages',+ 'stopped_services', 'missing_rules', 'changed_files']+ )+ assignment.status = (+ ServerTemplateAssignment.STATUS_DRIFTED if has_drift+ else ServerTemplateAssignment.STATUS_COMPLIANT+ )+ db.session.commit()+ return assignment++ @staticmethod+ def remediate(assignment_id):+ """Apply template to bring server back to expected state."""+ assignment = ServerTemplateAssignment.query.get(assignment_id)+ if not assignment:+ return None++ assignment.status = ServerTemplateAssignment.STATUS_REMEDIATING+ db.session.commit()++ try:+ from app.agent_gateway import get_agent_gateway+ gw = get_agent_gateway()+ if gw and assignment.server:+ spec = assignment.template.get_merged_spec()+ gw.send_command(assignment.server.agent_id, 'config_remediate', {+ 'assignment_id': assignment.id,+ 'spec': spec,+ })+ except Exception as e:+ logger.warning(f'Could not send remediate command: {e}')++ return assignment++ @staticmethod+ def get_server_assignments(server_id):+ return ServerTemplateAssignment.query.filter_by(server_id=server_id).all()++ @staticmethod+ def get_template_assignments(template_id):+ return ServerTemplateAssignment.query.filter_by(template_id=template_id).all()++ @staticmethod+ def get_compliance_summary():+ """Get fleet-wide compliance summary."""+ assignments = ServerTemplateAssignment.query.all()+ total = len(assignments)+ if total == 0:+ return {'total': 0, 'compliant': 0, 'drifted': 0, 'unknown': 0, 'compliance_pct': 100}++ compliant = sum(1 for a in assignments if a.status == 'compliant')+ drifted = sum(1 for a in assignments if a.status == 'drifted')+ unknown = total - compliant - drifted++ return {+ 'total': total,+ 'compliant': compliant,+ 'drifted': drifted,+ 'unknown': unknown,+ 'compliance_pct': round(compliant / total * 100, 1) if total > 0 else 100,+ }diff --git a/frontend/src/App.jsx b/frontend/src/App.jsxindex f26a2a56..d0e4e2d1 100644--- a/frontend/src/App.jsx+++ b/frontend/src/App.jsx@@ -43,6 +43,7 @@ import Email from './pages/Email';import SSOCallback from './pages/SSOCallback';import DatabaseMigration from './pages/DatabaseMigration';import AgentPlugins from './pages/AgentPlugins';+import ServerTemplates from './pages/ServerTemplates';// Page title mappingconst PAGE_TITLES = {@@ -76,6 +77,7 @@ const PAGE_TITLES = {'/fleet': 'Agent Fleet','/fleet-monitor': 'Fleet Monitor','/agent-plugins': 'Agent Plugins',+ '/server-templates': 'Server Templates',};function PageTitleUpdater() {@@ -213,6 +215,7 @@ function AppRoutes() {<Route path="fleet" element={<AgentFleet />} /><Route path="fleet-monitor" element={<FleetMonitor />} /><Route path="agent-plugins" element={<AgentPlugins />} />+ <Route path="server-templates" element={<ServerTemplates />} /><Route path="downloads" element={<Downloads />} /><Route path="firewall" element={<Navigate to="/security/firewall" replace />} /><Route path="git" element={<Git />} />diff --git a/frontend/src/components/sidebarItems.js b/frontend/src/components/sidebarItems.jsindex fd95cb20..b8170c76 100644--- a/frontend/src/components/sidebarItems.js+++ b/frontend/src/components/sidebarItems.js@@ -49,6 +49,13 @@ export const SIDEBAR_ITEMS = [category: 'infrastructure',icon: '<path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z"/>'},+ {+ id: 'server-templates',+ label: 'Server Templates',+ route: '/server-templates',+ category: 'infrastructure',+ icon: '<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/><polyline points="10 9 9 9 8 9"/>'+ },{id: 'domains',label: 'Domains & Sites',diff --git a/frontend/src/pages/ServerTemplates.jsx b/frontend/src/pages/ServerTemplates.jsxnew file mode 100644index 00000000..793f8684--- /dev/null+++ b/frontend/src/pages/ServerTemplates.jsx@@ -0,0 +1,309 @@+import React, { useState, useEffect, useCallback } from 'react';+import api from '../services/api';+import { useToast } from '../contexts/ToastContext';+import { useAuth } from '../contexts/AuthContext';+import Spinner from '../components/Spinner';+import ConfirmDialog from '../components/ConfirmDialog';++const ServerTemplates = () => {+ const toast = useToast();+ const { user } = useAuth();+ const [templates, setTemplates] = useState([]);+ const [library, setLibrary] = useState({});+ const [compliance, setCompliance] = useState(null);+ const [loading, setLoading] = useState(true);+ const [showCreateModal, setShowCreateModal] = useState(false);+ const [showAssignModal, setShowAssignModal] = useState(false);+ const [selectedTemplate, setSelectedTemplate] = useState(null);+ const [selectedDetail, setSelectedDetail] = useState(null);+ const [deleteConfirm, setDeleteConfirm] = useState(null);+ const [servers, setServers] = useState([]);+ const [tab, setTab] = useState('templates');++ const [form, setForm] = useState({+ name: '', description: '', category: 'general',+ packages: '', services: [], firewall_rules: [],+ auto_remediate: false, remediation_approval_required: true+ });++ const loadData = useCallback(async () => {+ try {+ const [tData, lData, cData] = await Promise.all([+ api.getServerTemplates(),+ api.getServerTemplateLibrary(),+ api.getTemplateCompliance(),+ ]);+ setTemplates(tData.templates || []);+ setLibrary(lData.templates || {});+ setCompliance(cData);+ } catch (err) {+ toast.error('Failed to load templates');+ } finally {+ setLoading(false);+ }+ }, [toast]);++ useEffect(() => {+ loadData();+ api.getServers().then(d => setServers(d.servers || [])).catch(() => {});+ }, [loadData]);++ const handleCreate = async () => {+ try {+ const data = {+ ...form,+ packages: form.packages.split('\n').map(p => p.trim()).filter(Boolean),+ };+ await api.createServerTemplate(data);+ toast.success('Template created');+ setShowCreateModal(false);+ loadData();+ } catch (err) {+ toast.error(err.message);+ }+ };++ const handleCreateFromLibrary = async (key) => {+ try {+ await api.createServerTemplateFromLibrary(key);+ toast.success('Template created from library');+ loadData();+ } catch (err) {+ toast.error(err.message);+ }+ };++ const handleDelete = async (id) => {+ try {+ await api.deleteServerTemplate(id);+ toast.success('Template deleted');+ setDeleteConfirm(null);+ loadData();+ } catch (err) {+ toast.error(err.message);+ }+ };++ const handleAssign = async (templateId, serverId) => {+ try {+ await api.assignServerTemplate(templateId, serverId);+ toast.success('Template assigned');+ setShowAssignModal(false);+ loadData();+ } catch (err) {+ toast.error(err.message);+ }+ };++ const handleCheckDrift = async (assignmentId) => {+ try {+ await api.checkTemplateDrift(assignmentId);+ toast.success('Drift check initiated');+ loadData();+ } catch (err) {+ toast.error(err.message);+ }+ };++ const handleRemediate = async (assignmentId) => {+ try {+ await api.remediateTemplateDrift(assignmentId);+ toast.success('Remediation initiated');+ loadData();+ } catch (err) {+ toast.error(err.message);+ }+ };++ const categoryLabels = {+ general: 'General', web: 'Web Server', database: 'Database', mail: 'Mail Server', custom: 'Custom'+ };++ if (loading) return <Spinner />;++ return (+ <div className="server-templates-page">+ <header className="top-bar">+ <div className="top-bar__title">+ <h1>Server Templates</h1>+ <span className="top-bar__subtitle">+ {templates.length} template{templates.length !== 1 ? 's' : ''}+ {compliance && ` \u2022 ${compliance.compliance_pct}% fleet compliance`}+ </span>+ </div>+ <div className="top-bar__actions">+ {user?.is_admin && (+ <button className="btn btn--primary" onClick={() => setShowCreateModal(true)}>+ Create Template+ </button>+ )}+ </div>+ </header>++ {compliance && (+ <div className="compliance-bar">+ <div className="compliance-bar__stats">+ <div className="stat-item stat-item--success">+ <span className="stat-item__value">{compliance.compliant}</span>+ <span className="stat-item__label">Compliant</span>+ </div>+ <div className="stat-item stat-item--danger">+ <span className="stat-item__value">{compliance.drifted}</span>+ <span className="stat-item__label">Drifted</span>+ </div>+ <div className="stat-item stat-item--muted">+ <span className="stat-item__value">{compliance.unknown}</span>+ <span className="stat-item__label">Unknown</span>+ </div>+ </div>+ <div className="compliance-bar__progress">+ <div className="progress-fill" style={{ width: `${compliance.compliance_pct}%` }} />+ </div>+ </div>+ )}++ <div className="tabs">+ <button className={`tab ${tab === 'templates' ? 'active' : ''}`} onClick={() => setTab('templates')}>Templates</button>+ <button className={`tab ${tab === 'library' ? 'active' : ''}`} onClick={() => setTab('library')}>Library</button>+ </div>++ {tab === 'templates' && (+ <div className="templates-grid">+ {templates.map(tmpl => (+ <div key={tmpl.id} className="template-card card" onClick={() => setSelectedDetail(selectedDetail?.id === tmpl.id ? null : tmpl)}>+ <div className="template-card__header">+ <h3>{tmpl.name}</h3>+ <span className="badge badge--outline">{categoryLabels[tmpl.category] || tmpl.category}</span>+ </div>+ {tmpl.description && <p className="template-card__desc">{tmpl.description}</p>}+ <div className="template-card__meta">+ <span>v{tmpl.version}</span>+ <span>{tmpl.assignment_count} server{tmpl.assignment_count !== 1 ? 's' : ''}</span>+ {tmpl.parent_name && <span>Inherits: {tmpl.parent_name}</span>}+ </div>+ <div className="template-card__spec">+ {tmpl.packages?.length > 0 && <span>{tmpl.packages.length} packages</span>}+ {tmpl.services?.length > 0 && <span>{tmpl.services.length} services</span>}+ {tmpl.firewall_rules?.length > 0 && <span>{tmpl.firewall_rules.length} firewall rules</span>}+ </div>+ <div className="template-card__actions" onClick={e => e.stopPropagation()}>+ <button className="btn btn--sm btn--primary" onClick={() => { setSelectedTemplate(tmpl); setShowAssignModal(true); }}>+ Assign+ </button>+ {user?.is_admin && (+ <button className="btn btn--sm btn--danger" onClick={() => setDeleteConfirm(tmpl)}>Delete</button>+ )}+ </div>+ </div>+ ))}+ {templates.length === 0 && (+ <div className="empty-state">+ <p>No templates yet. Create one or use a library template.</p>+ </div>+ )}+ </div>+ )}++ {tab === 'library' && (+ <div className="templates-grid">+ {Object.entries(library).map(([key, tmpl]) => (+ <div key={key} className="template-card card">+ <div className="template-card__header">+ <h3>{tmpl.name}</h3>+ <span className="badge badge--outline">{categoryLabels[tmpl.category] || tmpl.category}</span>+ </div>+ <p className="template-card__desc">{tmpl.description}</p>+ <div className="template-card__spec">+ {tmpl.packages?.length > 0 && <span>{tmpl.packages.length} packages</span>}+ {tmpl.services?.length > 0 && <span>{tmpl.services.length} services</span>}+ {tmpl.firewall_rules?.length > 0 && <span>{tmpl.firewall_rules.length} firewall rules</span>}+ </div>+ <div className="template-card__actions">+ <button className="btn btn--sm btn--primary" onClick={() => handleCreateFromLibrary(key)}>+ Use Template+ </button>+ </div>+ </div>+ ))}+ </div>+ )}++ {/* Create Modal */}+ {showCreateModal && (+ <div className="modal-overlay" onClick={() => setShowCreateModal(false)}>+ <div className="modal" onClick={e => e.stopPropagation()}>+ <div className="modal__header">+ <h2>Create Template</h2>+ <button className="modal__close" onClick={() => setShowCreateModal(false)}>×</button>+ </div>+ <div className="modal__body">+ <div className="form-group">+ <label>Name</label>+ <input className="form-input" value={form.name} onChange={e => setForm({...form, name: e.target.value})} />+ </div>+ <div className="form-group">+ <label>Description</label>+ <textarea className="form-input" value={form.description} onChange={e => setForm({...form, description: e.target.value})} rows={2} />+ </div>+ <div className="form-group">+ <label>Category</label>+ <select className="form-select" value={form.category} onChange={e => setForm({...form, category: e.target.value})}>+ {Object.entries(categoryLabels).map(([k, v]) => <option key={k} value={k}>{v}</option>)}+ </select>+ </div>+ <div className="form-group">+ <label>Packages (one per line)</label>+ <textarea className="form-input form-input--mono" value={form.packages} onChange={e => setForm({...form, packages: e.target.value})} rows={4} placeholder="nginx php-fpm certbot" />+ </div>+ <div className="form-group">+ <label className="checkbox-label">+ <input type="checkbox" checked={form.auto_remediate} onChange={e => setForm({...form, auto_remediate: e.target.checked})} />+ Auto-remediate drift+ </label>+ </div>+ </div>+ <div className="modal__footer">+ <button className="btn" onClick={() => setShowCreateModal(false)}>Cancel</button>+ <button className="btn btn--primary" onClick={handleCreate} disabled={!form.name}>Create</button>+ </div>+ </div>+ </div>+ )}++ {/* Assign Modal */}+ {showAssignModal && selectedTemplate && (+ <div className="modal-overlay" onClick={() => setShowAssignModal(false)}>+ <div className="modal" onClick={e => e.stopPropagation()}>+ <div className="modal__header">+ <h2>Assign {selectedTemplate.name}</h2>+ <button className="modal__close" onClick={() => setShowAssignModal(false)}>×</button>+ </div>+ <div className="modal__body">+ <p>Select a server to apply this template:</p>+ <div className="server-select-list">+ {servers.map(server => (+ <div key={server.id} className="server-select-item" onClick={() => handleAssign(selectedTemplate.id, server.id)}>+ <span className={`status-dot status-dot--${server.status === 'online' ? 'success' : 'danger'}`} />+ <span>{server.name}</span>+ </div>+ ))}+ </div>+ </div>+ </div>+ </div>+ )}++ {deleteConfirm && (+ <ConfirmDialog+ title="Delete Template"+ message={`Delete "${deleteConfirm.name}"? This cannot be undone.`}+ onConfirm={() => handleDelete(deleteConfirm.id)}+ onCancel={() => setDeleteConfirm(null)}+ variant="danger"+ />+ )}+ </div>+ );+};++export default ServerTemplates;diff --git a/frontend/src/services/api.js b/frontend/src/services/api.jsindex 57bc819a..b6c0e335 100644--- a/frontend/src/services/api.js+++ b/frontend/src/services/api.js@@ -3437,6 +3437,73 @@ class ApiService {async getPluginSpec() {return this.request('/agent-plugins/spec');}+ // ========================================+ // Server Templates endpoints+ // ========================================+ async getServerTemplates(category) {+ const query = category ? `?category=${category}` : '';+ return this.request(`/server-templates/${query}`);+ }++ async getServerTemplate(id) {+ return this.request(`/server-templates/${id}`);+ }++ async getServerTemplateLibrary() {+ return this.request('/server-templates/library');+ }++ async createServerTemplateFromLibrary(key) {+ return this.request(`/server-templates/library/${key}`, { method: 'POST' });+ }++ async createServerTemplate(data) {+ return this.request('/server-templates/', { method: 'POST', body: data });+ }++ async updateServerTemplate(id, data) {+ return this.request(`/server-templates/${id}`, { method: 'PUT', body: data });+ }++ async deleteServerTemplate(id) {+ return this.request(`/server-templates/${id}`, { method: 'DELETE' });+ }++ async assignServerTemplate(templateId, serverId) {+ return this.request(`/server-templates/${templateId}/assign`, {+ method: 'POST', body: { server_id: serverId }+ });+ }++ async bulkAssignTemplate(templateId, serverIds) {+ return this.request(`/server-templates/${templateId}/bulk-assign`, {+ method: 'POST', body: { server_ids: serverIds }+ });+ }++ async getTemplateAssignments(templateId) {+ return this.request(`/server-templates/${templateId}/assignments`);+ }++ async unassignTemplate(assignmentId) {+ return this.request(`/server-templates/assignments/${assignmentId}`, { method: 'DELETE' });+ }++ async checkTemplateDrift(assignmentId) {+ return this.request(`/server-templates/assignments/${assignmentId}/check`, { method: 'POST' });+ }++ async remediateTemplateDrift(assignmentId) {+ return this.request(`/server-templates/assignments/${assignmentId}/remediate`, { method: 'POST' });+ }++ async getTemplateCompliance() {+ return this.request('/server-templates/compliance');+ }++ async getServerTemplateAssignments(serverId) {+ return this.request(`/server-templates/server/${serverId}`);+ }}export const api = new ApiService();diff --git a/frontend/src/styles/main.less b/frontend/src/styles/main.lessindex 2b6473cc..2d681a34 100644--- a/frontend/src/styles/main.less+++ b/frontend/src/styles/main.less@@ -86,3 +86,4 @@@import 'pages/_service-detail';@import 'pages/_fleet-monitor';@import 'pages/_agent-plugins';+@import 'pages/_server-templates';diff --git a/frontend/src/styles/pages/_server-templates.less b/frontend/src/styles/pages/_server-templates.lessnew file mode 100644index 00000000..96fd9fa9--- /dev/null+++ b/frontend/src/styles/pages/_server-templates.less@@ -0,0 +1,133 @@+// Server Templates page styles++.server-templates-page {+ .compliance-bar {+ margin: @spacing-lg 0;+ padding: @spacing-lg;+ background: @card-bg;+ border-radius: @radius-lg;+ border: 1px solid @border-color;++ &__stats {+ display: flex;+ gap: @spacing-xl;+ margin-bottom: @spacing-md;+ }++ &__progress {+ height: 8px;+ background: @border-color;+ border-radius: 4px;+ overflow: hidden;++ .progress-fill {+ height: 100%;+ background: @success-color;+ border-radius: 4px;+ transition: width 0.3s ease;+ }+ }+ }++ .stat-item {+ display: flex;+ flex-direction: column;++ &__value {+ font-size: 1.5rem;+ font-weight: 700;+ }++ &__label {+ font-size: 0.8rem;+ color: @text-muted;+ text-transform: uppercase;+ }++ &--success .stat-item__value { color: @success-color; }+ &--danger .stat-item__value { color: @danger-color; }+ &--muted .stat-item__value { color: @text-muted; }+ }++ .templates-grid {+ display: grid;+ grid-template-columns: repeat(auto-fill, minmax(340px, 1fr));+ gap: @spacing-lg;+ margin-top: @spacing-lg;+ }++ .template-card {+ padding: @spacing-lg;+ display: flex;+ flex-direction: column;+ gap: @spacing-sm;+ cursor: pointer;+ transition: border-color 0.15s;++ &:hover {+ border-color: @primary-color;+ }++ &__header {+ display: flex;+ justify-content: space-between;+ align-items: center;++ h3 { margin: 0; }+ }++ &__desc {+ color: @text-secondary;+ font-size: 0.9rem;+ margin: 0;+ }++ &__meta {+ display: flex;+ gap: @spacing-md;+ font-size: 0.85rem;+ color: @text-muted;+ }++ &__spec {+ display: flex;+ flex-wrap: wrap;+ gap: @spacing-xs;++ span {+ font-size: 0.8rem;+ padding: 2px 8px;+ background: @hover-bg;+ border-radius: @radius-sm;+ }+ }++ &__actions {+ display: flex;+ gap: @spacing-sm;+ margin-top: @spacing-sm;+ padding-top: @spacing-sm;+ border-top: 1px solid @border-color;+ }+ }++ .server-select-list {+ display: flex;+ flex-direction: column;+ gap: @spacing-xs;+ max-height: 300px;+ overflow-y: auto;+ }++ .server-select-item {+ display: flex;+ align-items: center;+ gap: @spacing-sm;+ padding: @spacing-sm @spacing-md;+ border-radius: @radius-md;+ cursor: pointer;+ transition: background-color 0.15s;++ &:hover { background: @hover-bg; }+ }+}